Release version 0.7

After nearly 7 years...

vpatch: silence a compiler warning.

Apparently attrset seems to return a value so we need
to explicitly ignore it.

Signed-off-by: NeilBrown <neilb@suse.de>

Add a number of tests which had not been commited to 'git' previously.

Signed-off-by: NeilBrown <neilb@suse.de>

Improve diff/fixup when diff is greedy at end of a diff.

The 'fixup' code to make up for the greediness of diff did not
treat the end of the diff as a (zero length) match which can be grown.
This could leave no context at the end of a 'diff'.

Applying a patch with no trailing context can cause confusion.

This fixes the issue raise by Debian Bug 271766

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=271766

The sample from that bug is included as a test.

Signed-off-by: NeilBrown <neilb@suse.de>

Makefile: (clean): do not delete original files

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Neil Brown <neilb@suse.de>

extract.c: (split_merge): initialize with NULL

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Neil Brown <neilb@suse.de>

wiggle.1: fix hyphens

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Neil Brown <neilb@suse.de>

Improve parsing of diff -u output.

Normally chunks start
  @@ -%d,%d +%d%d @@
but if a section is just one line long, the ',1' is dropped, so
  @@ -%d +%d @@

is possible.

Fix an off-by-one bug.

I assume .... I don't remember, sorry.

vpatch: remove a pointless dereference.

Various little changes to p.

I did them a while ago an don't remember..

Fix a couple of little bugs that crept in to p

Signed-off-by: Neil Brown <neilb@suse.de>

Add export option to p

This is a preliminary attempt at git integration.

Signed-off-by: Neil Brown <neilb@suse.de>

Add rebase function to 'p'

This moves all 'applied' patches to 'included'
and makes the current files 'current'  and 'orig'.

Signed-off-by: Neil Brown <neilb@suse.de>

When calling a recursive p, use $0 to find it.

This applied to recommit and decommit

Signed-off-by: Neil Brown <neilb@suse.de>

Fix up problem with make_diff

Because creation of .patches/patch is now delayed,
we couldn't delete it when needed.

Signed-off-by: Neil Brown <neilb@suse.de>

get_conf was messing up the 'name' variable

Signed-off-by: Neil Brown <neilb@suse.de>

Define 'p unapply'

This reverses an applied patch that was forced in.
It goes back to the removed directory exactly as it was.

Signed-off-by: Neil Brown <neilb@suse.de>

Don't allow patch reviewing and patch applying to overlap

Otherwise we get into a mess

Signed-off-by: Neil Brown <neilb@suse.de>

Fix typo in to-resolve name

To make sure we don't commit with resolving conflicts.

Signed-off-by: Neil Brown <neilb@suse.de>

Allow tagline in config instead of hard-coding $CERT

Other people wouldn't want my $CERT ....

Signed-off-by: Neil Brown <neilb@suse.de>

Handle config file for author/maintainer/cc

e.g.

author = NeilBrown <neilb@suse.de>
header = X-Face: whatever
header = "       and whatever

maintainer = akpm@osdl.org
[Nfsd]
 tag=kNFSd
 cc=nfs@lists.sourceforge.net
[Md]
 tag=md
 cc=linux-raid@vger.kernel.org

Signed-off-by: Neil Brown <neilb@suse.de>

Move base files from ~current~ to .patches/current/

similarly for ~orig~.
This means the tree isn't cluttered with yukky file names.

Also add 'p upgrade' functionality to move files in an active tree.

Signed-off-by: Neil Brown <neilb@suse.de>

Just some TODO updates

Signed-off-by: Neil Brown <neilb@suse.de>

Remove unnwanted empty file

Support searching backwards too.

Signed-off-by: Neil Brown <neilb@suse.de>

Basic incremental search support.

Only forward, and still some rough edges,
and only once per line, and no highlighting etc.
But there is real functionality there.

Signed-off-by: Neil Brown <neilb@suse.de>

Move to start or end of line.

Signed-off-by: Neil Brown <neilb@suse.de>

Support horizontal movement: left and right.

Side-scroll on demand

Signed-off-by: Neil Brown <neilb@suse.de>

Find previous and next diffs.

'P' and 'N'

Signed-off-by: Neil Brown <neilb@suse.de>

Page up and down

Control-V and ESC-v

Signed-off-by: Neil Brown <neilb@suse.de>

Fix bug where first line always displayed as a blank.

Signed-off-by: Neil Brown <neilb@suse.de>

Movement commands for top and bottom

ESC < or 0G   for top
ESC > or G    for bottom

Some number-prefix stuff too.

Signed-off-by: Neil Brown <neilb@suse.de>

Blank screen after end of file and before beginning.

Signed-off-by: Neil Brown <neilb@suse.de>

Add todo file

Signed-off-by: Neil Brown <neilb@suse.de>

Adequate viewing of merged diffs now.

Displays + and - lines as appropriate and can
be positioned on any line.

Signed-off-by: Neil Brown <neilb@suse.de>

Beginning of handling of grouped diffs.

i.e. if there are some '-' and some '+' lines together,
then all the '-' come first, followed by all the '+',
rather than intermingling them.

Signed-off-by: Neil Brown <neilb@suse.de>

Remove all trailing blanks.

There are quite a few...

Signed-off-by: Neil Brown <neilb@suse.de>

Improvements to brower mode.

While still simplistic, it now displays deletes and inserts
on different lines, so each file line can be 1 or 2
screen lines.

Signed-off-by: Neil Brown <neilb@suse.de>

Remove support for the name 'vpatch'

Apparently it is otherwise used:
   http://www.tibed.net/index.php?page=vpatch

Signed-off-by: Neil Brown <neilb@suse.de>

Get merge2 to pass all the tests...

Some of this done by changing tests...

Signed-off-by: Neil Brown <neilb@suse.de>

Add tests/linux/idmap.h

I must have missed it before.

Fix a couple of signed/unsigned  warnings
(cherry picked from 80e90ff5842fb2b382efe8768f441ddbdca5300e commit)

Add new patch-browsing mode - needs a lot of work.
(cherry picked from 0b29f4153dbe34b164e2636066c19d2c383e17e4 commit)

Still more updates to 'p'

Cope if 'best' doesn't find anything any good.

More updates to 'p'

Assorted fixes and enhancements...

Various enhancements to 'p'

Fix off-by-one-error when extracting a merge file.

If a merge ended at EOF, --extract wouldn't interpret it properly.

Add recommit option to 'p'

Add wiggle.spec and fix typos in ANNOUNCE

Remove usage of debian-specific --quiet flag to /usr/bin/time

Wiggle 0.6 - first release